| commit | 35738e87105e1a11ced6a6b497146bbd189d4fb2 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <junio@hera.kernel.org> | Mon Jan 07 07:55:46 2008 |
| committer | Junio C Hamano <junio@hera.kernel.org> | Mon Jan 07 07:55:46 2008 |
| tree | 352f4473f85ea0e327b3a0e3b9739d80f8462eb9 | |
| parent | 14b76487ff861981455b320a2c6d17632997773e [diff] [blame] |
Autogenerated HTML docs for v1.5.4-rc2-60-gb2e62
diff --git a/git-merge-file.txt b/git-merge-file.txt index 31882ab..c513184 100644 --- a/git-merge-file.txt +++ b/git-merge-file.txt
@@ -41,7 +41,7 @@ git-merge-file is designed to be a minimal clone of RCS merge, that is, it implements all of RCS merge's functionality which is needed by -gitlink:git[1]. +linkgit:git[1]. OPTIONS @@ -89,4 +89,4 @@ GIT --- -Part of the gitlink:git[7] suite +Part of the linkgit:git[7] suite